Merge changes from CEDET upstream.
authorDavid Engster <dengste@eml.cc>
Thu, 25 Oct 2012 20:16:14 +0000 (22:16 +0200)
committerDavid Engster <dengste@eml.cc>
Thu, 25 Oct 2012 20:16:14 +0000 (22:16 +0200)

Trivial merge